From afb57880716d272b1bc56e33f61cf8d6a376f0f8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 16 Nov 2000 01:19:27 +0000 Subject: [PATCH] Don't move back one char when we are actually at the end of the paragraph. Wed Nov 15 20:16:54 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Don't move back one char when we are actually at the end of the paragraph. CV: ---------------------------------------------------------------------- --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextlayout.c | 10 +++++----- 8 files changed, 47 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a5427d52f5..4040a6fbcf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Nov 15 20:16:54 2000 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): + Don't move back one char when we are actually at the end of the + paragraph. + 2000-11-15 Robert Brady * modules/input/iminuktitut.c (inuktitut_compose_seqs): diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 68e2d0abbd..5d5b8e8ee7 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2501,11 +2501,11 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout, direction < 0 ? byte_offset : byte_offset + layout_line->length, 0); - /* FIXME: As a bad hack, we move back one position to avoid going - * to next line on a forced break not at whitespace. Real fix - * is to keep track of whether marks are at leading or trailing edge? - */ - if (direction > 0 && layout_line->length > 0) + /* FIXME: As a bad hack, we move back one position when we + * are inside a paragraph to avoid going to next line on a + * forced break not at whitespace. Real fix is to keep track + * of whether marks are at leading or trailing edge? */ + if (direction > 0 && layout_line->length > 0 && !gtk_text_iter_ends_line (iter)) gtk_text_iter_prev_char (iter); break; -- 2.30.2